Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Thu, 25 Feb 2010 02:25:29 +0000 (02:25 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Thu, 25 Feb 2010 02:25:29 +0000 (02:25 +0000)

Trivial merge